Fix Source.targetPath incorrectly aligned to basedir#12206
Merged
Conversation
gnodet
added a commit
that referenced
this pull request
Jun 2, 2026
Cherry-pick from fix/resource-targetpath-compat branch. Supersedes earlier #12178 cherry-pick with expanded fix. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
rmannibucau
approved these changes
Jun 2, 2026
Bukama
requested changes
Jun 3, 2026
Bukama
left a comment
Bukama
left a comment
Contributor
There was a problem hiding this comment.
Failing tests
Error: Failures:
Error: MavenITmng4559MultipleJvmArgsTest.testMultipleJvmArgs:56 expected: <value1> but was: <${test.prop1}>
Error: MavenITmng4559SpacesInJvmOptsTest.testIt:52 expected: <foo bar> but was: <${prop.jvm-opts}>
gnodet
force-pushed
the
fix/resource-targetpath-compat
branch
from
29c67b5 to
ba00e3c
Compare
Contributor
Author
|
The second commit (test isolation fix) has been dropped — it referenced static fields that only existed in an older version of the codebase and was causing compilation failures on master. The PR is now a single clean commit fixing only the CI is fully green (19/19 checks pass). @Bukama could you re-review? The changes-requested items should be addressed by dropping that commit entirely. |
6 tasks
The DefaultModelPathTranslator was aligning Source.targetPath to the project basedir, converting relative paths like "META-INF/tags/rdc" into absolute paths. This caused maven-resources-plugin to copy resources to wrong locations (e.g., /META-INF/tags/rdc instead of target/classes/META-INF/tags/rdc). The targetPath is relative to the output directory (target/classes or target/test-classes), not the project basedir, so it must not be resolved against basedir during model path translation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
gnodet
force-pushed
the
fix/resource-targetpath-compat
branch
from
ba00e3c to
08072a3
Compare
Contributor
Author
cstamas
approved these changes
Jun 4, 2026
Bukama
approved these changes
Jun 4, 2026
|
@gnodet Please assign appropriate label to PR according to the type of change. |
gnodet
added a commit
that referenced
this pull request
Jun 4, 2026
The DefaultModelPathTranslator was aligning Source.targetPath to the project basedir, converting relative paths like "META-INF/tags/rdc" into absolute paths. This caused maven-resources-plugin to copy resources to wrong locations (e.g., /META-INF/tags/rdc instead of target/classes/META-INF/tags/rdc). The targetPath is relative to the output directory (target/classes or target/test-classes), not the project basedir, so it must not be resolved against basedir during model path translation. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DefaultModelPathTranslator.alignToBaseDirectory(Source)was incorrectly resolvingSource.targetPathagainst the project basedir, converting relative paths likeMETA-INF/tags/rdcinto absolute paths like/path/to/project/META-INF/tags/rdcmaven-resources-pluginto copy resources to wrong locations when using POM 4.1.0<source>elements with<targetPath>targetPathis relative to the output directory (target/classes), not the project basedir, so it must not be aligned during model path translationTest plan
DefaultModelPathTranslatorTest— verifies Source directory is aligned but targetPath is not, dot-prefixed targetPath stays relative, Resource directory is aligned but targetPath is notProjectBuilderTest#testSourceTargetPathRemainsRelative— verifies POM 4.1.0<source>targetPath stays relative through SourceRoot API and compat layerProjectBuilderTest#testResourceTargetPathRemainsRelativeInCompatLayer— verifies POM 4.0.0<resource>targetPath stays relative<source><targetPath>META-INF/tags/rdc</targetPath></source>now copies totarget/classes/META-INF/tags/rdc/(was copying to/path/to/project/META-INF/tags/rdc/)impl/maven-implandimpl/maven-core🤖 Generated with Claude Code